Merge "Avoid pixel rounding issue during animation" into oc-dev
am: 4a7d0772a5

Change-Id: I32d6e56f129b2ae520ec91200f29fc9ed7f593ff