Merge "Try to keep the same native Surface object when reading a parcel" into jb-mr2-dev