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