Fix Bug 888440, ensure correct functioning of device back button
Merge pull request #129 from ossreleasefeed/bug888440-back-button-fix

Fix Bug 888440, ensure correct functioning of device back button