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

Change-Id: I894e05b5efe29ff64e9f4d74228a02b85b704acb