Merge "Revert "Enable color resources loader to be created using FRRO"" into main