Merge "WindowManager: Avoid reparenting BLAST Surface in reparentChildren" into rvc-dev