Fix Bug 888440, ensure correct functioning of device back button

@lauraxt r?