Merge "Make sure checking for accessibility pane is consistent"