Merge "Make "work mode on dialog" show personal challenge in unified work lock" into nyc-dev
am: 0858ce14
* commit '0858ce14':
Make "work mode on dialog" show personal challenge in unified work lock
Change-Id: If1d5da67189a8eae98769c1f0c859c5d8e8d5290