Merge "Organization field should receive focus after selecting "Add organization""