Merge "Align account icon size of ChooseAccountTypeActivity" into pi-dev