Apply line styles on display-updated.
Apply line styles on display-updated.

... but only after we've received a marker change event.

antcodd/merge-conflicts,smashwilson/merge-conflicts,smashwilson/merge-conflicts