Merge "Add back AccessibilityFloatingMenuController into StatusBar"