Merge "Declare a highlight menu key for ButtonNavigationSettingsAssistController"