Merge "Move windowing layers appropriately" into rvc-dev