Merge "Put "Add user" dialog within activity to capture focus" into main