Merge "Block "Screen lock" menu if password is managed." into nyc-dev