Merge "SF: Switch computeBounds to return FloatRect" am: f07ec17f19 am: 39c09a202f
am: a2510c6364  -s ours

Change-Id: Ibfb913ad3325f87600641a41c73d328d8416cab2