Merge "fix soft renderer rotation" into mnc-dev