Merge "Update listening state when settings changes"