Merge "Change gesture settings for Ambient Display from nudge to double tap." into nyc-mr1-dev