Merge "Add extra error checking for Home Gesture Tutorial" into tm-qpr-dev