Merge "Handle config/display changes for WindowContext"