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

Change-Id: I3e53225fd98098720b0ac964bdface76e4a7e346