Merge "Remove WindowManager references in Stk"