Merge "Revert "Remove many (most) of the calls to Dependency.get() from StatusBar.""