Merge "[RESTRICT AUTOMERGE] Send WindowContext config only when Display is active" into sc-v2-dev