Merge "[SurfaceFlinger] Make sure data space is set correctly" into pi-dev am: c9340b63a8
am: 5685a2e79a

Change-Id: I6410a8fd5ef65ed58ec2210d43236cb7026513e4