Merge "Try harder to find a camera app to pin." into pi-dev
am: b0e3c67824

Change-Id: I1c8a1de5408ff26c740fb1ab91303087ad55aa3f