Merge "Adjust Rear Display Dialog Landscape Layout" into udc-dev