Merge "Fix persistence bug with toggle actions"