Merge "Don't reset channel field when loading the app" into pi-dev