Merge "Keep track of SystemUiContext before WMS is initialized" into main