Merge "Align title with play/pause button" into udc-dev