Merge "Fix back gesture routed to wrong display" into main