Merge "When system server goes down, crash apps more." into nyc-dev