Merge "Early out when window is no longer in hierarchy" into rvc-dev