Merge "Update notification group mapping when group key changes" into ub-launcher3-master