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

Change-Id: If23d7b5ab2c79874714a9f6a67625b09e7f83699