Merge "Ensure that the gesture handler always gets configuration change" into tm-qpr-dev