Merge "Enable app op history and fix a bug where history was lost."