Merge \\\"Fix that work apps settings page crash after changing work profile...
Merge \\\"Fix that work apps settings page crash after changing work profile to use separated lock\\\" into nyc-dev am: 64372056 am: 1e29965a
am: bba78565
Change-Id: Iba5f5f63a78e7f9e68465fa5598d6c6baf555771