Do not close modal if escape is pressed on select

    The modal no longer fades out when pressing escape if a select is
open. After this, the select input is unfocused, so the second press
on escape will still close the modal.

Fixes bug #1265869

Change-Id: I49fa4431152fa3101bb6fafa6e07c8f908396ba8
Merge "Do not close modal if escape is pressed on select"