Merge "Update notification display buckets." into rvc-dev