Merge "Only cancel bonding if pair button is not pressed" into tm-dev