Merge "Remove StaticLayout.addMeasuredRun"