Merge "Align caption touch area with width of caption." into udc-qpr-dev