Merge "Make StatusBarStateController be a CallbackController"