77863fc0ee917367103492bd08a7f25746cd000c

Restore the z-index to 2 to make sure the cursor is on top of intraline edits, which are colored using markText(). Change-Id: I1529768d163bd5ba5d10e5981aca619910f79d35
Description
RETIRED, Gerrit as used by OpenStack