Merge "Restore DE_sys snapshot when rollback APEX is activated."