Merge "Fix NPE in isPrivateBrowsingEnabled()" into jb-dev