Merge "StatusBar: Respond properly to global expand message" into jb-dev