Merge "Avoid NPE when removing fixed rotation transform" into udc-dev