Merge "Don't crash apps unfairly under FAS" into pi-dev