Merge "Reset inherit-parent bounds in finishTransaction"