Merge "Browser: Fix NPE when save tabs' view state"