Merge "Avoid pixel rounding issue during animation" into oc-dev