Merge "Fix AlternateBouncer touch handling" into udc-dev