[automerger skipped] Merge "Setting to change sysui theme" into pi-dev am: 7179206395
am: c7a226c27a  -s ours

Change-Id: I3d1ca4445c8ad50b04debd4728825b176787c1b9