Merge "Fixed width to resolve preview rendering issue on different screens" into udc-dev