Alternate default app picker (2/2)

Change-Id: Icd1c534701998dfdd057ef1d629c068cc6ae3c41