Merge "Store the themed icon enabled state in SharedPreferences" into sc-dev