Merge "Fix NPEs in StatusBarTest." into jb-dev