Merge "Unset the notification expansion state when fully hidden" into qt-r1-dev am: 24907e82a9
am: 5f2f141d39

Change-Id: I6e49b2021db409f1d8ba7179bda8bf35b21e06fb