Merge "Validate forced display size from settings" into udc-dev