Merge "Move OVERLAY_DISPLAY_DEVICES to Global." into jb-mr1-dev