Merge "Use the StorageManager constant for the PatternVisible key." into lmp-mr1-dev