Merge "Revert "Enabled WMS.DEBUG_STARTING_WINDOW"" into mnc-dev