Merge "Guard double-showing of user credentials dialog" into nyc-dev