Merge "Reduce toast duration for channel warnings." into oc-dev am: f6e956b1c6
am: c1dc15e8d0

Change-Id: I7c837df3a91727be805109dd8608b1e76761daec