Merge "Revert "Security: AccountChooser shouldn't auto reveal accounts."" into mnc-dev