Merge "Remove getLeash from WindowContainerToken" into rvc-dev