Merge "Create notification channel interstitial shelf" into qt-dev
am: d8f241214d

Change-Id: I3bfd9cbeb3c1342115bd29563b1be83b3190d4dd