Merge "Do not change focus when back gesture starts" into main