Merge "Eclipse 4.x fix: Don't attempt to get display too early"