Merge "Persist compat framework overrides across reboot"