Expand channel settings if coming from app am: f3290eafce
am: 520fde650d

Change-Id: I056fa1ed816ec1ef0b898ab18471f5dfe6c9613f