Merge "Don't hide the navscreen when going to bookmarks"