Renaming to 'theme' per UX recomendation Change-Id: I80817ea3778715c3514205ede738f70d92fa15e9 Fixes: 123042258 Test: manual