Merge "Refactor PickerDbFacade#queryMediaIdForApps implementation" into main