Merge "Modify feature flag of Personal Safety"