Merge "[Status Bar] Re-name StatusBar.java -> CentralSurfaces.java." into tm-dev