Merge "Use the bgCoroutineContext to update note shortcut" into main