Merge "Early checks to avoid unneeded binder calls" into main