Merge "Add atom to record controller state changes"