Merge "Cancel bonding upon back gesture." into tm-dev