Merge "Make "work mode on dialog" show personal challenge in unified work lock" into nyc-dev am: 0858ce1 am: a4cacbd
am: 388c54f
* commit '388c54fda1f12d59c2126dc0aeb994b2d59e3266':
Change-Id: I7325474f5c717e24c7b5fcc6b678805be6f0859d
This commit is contained in: