Merge "Split scroll factor into a 2d float." into oc-dev
am: 774b1f1f37

Change-Id: I1424f902aba4580258539db4327c66f4a4532045