Merge "Add back AccessibilityFloatingMenuController into StatusBar" into sc-v2-dev