Merge "Add Tap Gesture for Aware Settings" into qt-qpr1-dev