Merge "Several fixes to new EncryptionInterstitial dialog." into lmp-dev