Merge "Replace KeyChainActivity placeholder UI with more polished dialog (1 of 5)"