Merge "Use touch delegate in SwitchBar" into pi-dev