Alternate default app picker (1/2)

Change-Id: I60211cd945040d4097e94e4e92d3f81e954d4b81