Merge "Moving FORCE_MONOCHROME_APP_ICONS to New Flag System" into main