Merge "Bring up correct app for Recent location list items" into lmp-mr1-dev