Merge "Don't reset channel field when loading the app" into pi-dev am: 7ae4b0bbdc
am: a7aee6eea5

Change-Id: Ib6804e0fa325d04360b620aa36f043c6c707db1b