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

Change-Id: Iad489061a9f91d17097f45ff10da50f9210733a1