Merge "Restart UI if it crashes" into klp-dev