Merge "Update the themed icon feature's content Uri path" into sc-dev