Merge "HUN should not show up when the Notification shade is open" into qt-dev am: 17f08878e2
am: 47875fdc28

Change-Id: I2f5151f6fbf32d40e650d6e45767cc02ecc56f97