Merge "Make dataspace accessible to surface flinger"