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

Change-Id: I0d6de32607e50febed7efbe8d8918fdd9458ae02