Merge "Add condition check for double tap gesture settings." into nyc-mr1-dev
am: 6cab381bc2

Change-Id: I4e140a32c84c820761176e816cbb88c4be46ef70