Merge "Add Tap Gesture for Aware Settings"