Alternate default app picker (1/2)

Change-Id: I41c5563cb4af22a618e008585e8ee56fae344854