Merge "Clear settings provider before testing in A11yShortcutControllerTest"