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