Merge \\\"Fix that work apps settings page crash after changing work profile to use separated lock\\\" into nyc-dev am: 6437205648 am: 9feb501659
am: 2b59387499

Change-Id: I65b9ecc84c763721ce5c943fdd9a7f682f770da4