Merge "Bump the max size of the getUserData binder caches" into main