Merge "Do not update unified setting before updating primary profile lock" into nyc-dev