Merge "Use Display#DEFAULT_DISPLAY and #INVALID_DISPLAY" into pi-dev