Merge "Prevent wrong system ui visibility callback after the user swipe"