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

Change-Id: I9bd2cf719babf7786ded01d816326262cccca933