Merge "Settings crash when receiving data state broadcast"