GitLab

This also deactivates the keyboard before shutting down the shelf, which fixes a crash introduced by the above change.

BUG=577413

Review URL: https://codereview.chromium.org/1614233002

Cr-Commit-Position: refs/heads/master@{#371847}