Merge "Not showing menu buttons for any headsup notification" into qt-dev
am: 7ad66d5e14

Change-Id: I9b654373bab71c965502308631c05c6e2313874f