Merge "Merge "Enable logging for 'Themed icons' setting." into sc-dev am: 640fc8b84d am: afb977fabc" into sc-v2-dev-plus-aosp