Merge "Make ColorUpdateViewModel ActivityRetainedScoped (2/2)" into main