Merge "Fix swiping up on hub when when security is swipe." into main