Merge "Move flags to desktopmodeflag" into main