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

Change-Id: Id19fe2488406a3891cd433d8b1e9273a28b48fbb