Merge "Dismiss the ime switch notification properly"