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