Merge "Make the theme for choose account and choose account type dialogs same." into jb-mr1-dev