Merge "Don't crash apps on binder errors" into main