Merge "Remove references of the previous surface control in ViewRootImpl"