Merge "Fix ClassLoader issue of WindowContext" into sc-v2-dev