Merge "Fix some issues in notification bucketing" into qt-dev
am: 634c095610

Change-Id: I54775ee76fd944ac9fa1d8f67f30a1be9f053b97