Merge "Setting to change sysui theme" into pi-dev