Merge "Remove warning when associated display is ADISPLAY_ID_NONE."