Merge "Timeout to ensure user-switching dialog is closed"