Theme Settings Upgrades and TRDS

Change-Id: I6a109963e87359b668089185d03e439517516c19