Merge "Remove WMG#closeAll in WindowTokenClient" into sc-dev