Merge "Ensure addWindow/relayoutWindow won't return stale controls" into rvc-dev