Merge "Refactor CaptioningRepository to take current UserHandle into account." into main