Merge "Fix app callback broken when immediately restarting back gesture after cancel" into main