Merge "Don't attempt dismiss while user switch is in progress" into main