Merge "UI fix for account selector"