[automerger skipped] Merge "Add Tap Gesture for Aware Settings" into qt-qpr1-dev am: e39c7bd211
am: 003ee4342d -s ours
am skip reason: change_id Ib76327b37a415512145a150a4b0e176a6cb114d7 with SHA1 32af83b2cb is in history

Change-Id: I9434735660d7d61b43aa05aa658601dd6b8479dc