Merge "Re-use existing Surface objects when reading them from parcels." into gingerbread