Clean up uninstallation filter. Fix recording of installation errors.
Merge with next-stable.