Merge "[Fixed] UI issues after rotation" into udc-dev