Merge "Disable table top auto-rotation override" into udc-qpr-dev