Merge "Set alpha to 1 if not using alpha animation" into udc-dev