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

Change-Id: I585eed549a85dee0d213641255e62b4ce9cc252e