Merge "Make SurfaceControl parcelable (2/2)"