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

This reverts commit 71c9abdbd3c5dab28b248a532ee84db30d4ec91a.