Revert [2/2] Settings: Reverse default app picker behaviour