b=927719; DEVELOPER_OPTIONS set too late; r=gps
b=927727; support OpenGL OMTC layers on Windows; r=bgirard
Automatic merge