Merge "CTS doesn't like swiping." into oc-dev