Update device dropdown logic.
Update device overlay so that the modal overlay does not dismiss the
device overlay, the close button must now be selected for the device
overlay.