Merge "Setting to change sysui theme" into pi-dev
am: 7179206395

Change-Id: I34f0fa82b9b9ebb9d6ba7707363a5b948c9f0421