Merge commit '04b953132edb5482f0aa6d992f89e7016961528c' * commit '04b953132edb5482f0aa6d992f89e7016961528c': Re-use existing Surface objects when reading them from parcels.
Merge commit '04b953132edb5482f0aa6d992f89e7016961528c' * commit '04b953132edb5482f0aa6d992f89e7016961528c': Re-use existing Surface objects when reading them from parcels.