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
am: 1abb97da52

Change-Id: Iea3482ec553c31a3d6fc8bbfa810ba6fb118410c