Merge "settings no hiding when voiceaccess or switchaccess is on" into main