Merge "Add ANGLE support to getDisplay"