Fix selecting an existing App in another App

Change-Id: I32df7077c99e9877acdd859f51fc322eb161b8da
Closes-Bug: #1334461
Merge "Fix selecting an existing App in another App"