Merge "Correctly offset app op history on reboot" into rvc-dev