Merge "Defer adding surface changed callback until view root is valid" into tm-qpr-dev