Merge "Waiting for Normal state when swiping from a popup to home" into main