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