Merge "[Provider Model] Internal cleanup - remove Provider Model flag and deprecated legacy UI part.5"