Merge "Handle display windowing mode change in onConfigChanged" into main