Merge "Resolve NPE when user updates display size" into udc-dev