Merge "Enable tap-to-pulse only when needed" into nyc-mr1-dev