Merge "Remove binder priority propagation workaround"