Merge "Clean Safetyhub feature flag." into qt-dev