Merge "Part1 - Don't add padlock if the restriction is not set by admin." into nyc-dev