Merge "Fixes edge back working assuming boot up has back button"