Merge "Fix for HardwareBufferRenderer pre-rotation" into udc-dev