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

Change-Id: I9f640b4c496297084934cb8036e011e675077f0c