Merge "Fix notification ids for share/delete actions" into rvc-dev