Merge "Reduce use of static variables in window manager unit tests" into oc-dev