Merge "DozeService: Seperate double tap and pickup" into nyc-mr1-dev