Merge "Fix notification shell commands" into qt-qpr1-dev am: 818b083244
am: c9a25a2cec

Change-Id: Ib22bf1cec71613562436fe840bff9ac8d4e64978