Merge "Show account selector in PopupMenu to be less intrusive"