Merge "Handle races caused by rapid settings changed broadcasts" into klp-dev