Merge "Hide notification before tie managed profile lock" into nyc-dev