Merge "Update EncryptionStatusPrefController to BasePrefController"