Merge "When the notification shade is shown the functionality to show/hide HUN should be controlled via a config flag." into qt-dev
am: a6d0f1f7fa

Change-Id: I2048342222761925e11fb613d91c33a7ccf6a1a6