Updates to isolated line breaking interface
Merge remote-tracking branch 'upstream/dev' into android-dev