Merge "[Logging] Sync settings in offline and online models"