Merge "Fix high volume of binder calls in ContentProvider." into main