Merge "Introduce WindowManagerState field for sandboxing" into sc-v2-dev