Merge "Enable app op history"