Merge "Add DESKTOP_MODE_MAXIMIZE_WINDOW instrumentartion" into main