Merge "SF: Switch computeBounds to return FloatRect" am: f07ec17f19
am: 39c09a202f

Change-Id: Ie68ac3003f344b333f440d3793a9ba8200893c21