Alternate default app picker (2/2)

Change-Id: I01d2bf298def3ff7cd417d2495bcb81d7da00c77