Merge "Part1: Show the restricted lock icon in place of the pref widget." into nyc-dev