Merge "CDD: Require double-tap play/pause to be mapped to next track." into oc-mr1-dev