Merge "Adapt to moved ACCESSIBILITY_MENU_IN_SYSTEM location."