Fix for quiting the app with backbutton after the keyboard workaround
Merge branch 'upstream/development'