Merge "Adding CONNECTIVITY_KEEP_DATA_ON to handle Safety Situation" into main