Merge "Fix windowless splash won't removed while hovering back gesture." into main