Merge "Avoid unnecessary binder call to set the same orientation" into main