Merge \\\"Fix that work apps settings page crash after changing work profile to use separated lock\\\" into nyc-dev am: 6437205648 am: 1e29965a85
am: bba7856588

Change-Id: Iba5f5f63a78e7f9e68465fa5598d6c6baf555771