Merge "Accessibility: Don't remove checkbox outline on focus"