Merge "Consider double tap of the play/pause as the next track" into oc-dr1-dev