Merge "Made changes to padlock support for preferences."