Merge "Fixing the SettingsRoboTest failure of the AnimatedImagePreference." into sc-dev