Merge "Fix back gesture showing up on hub on lock screen" into main