custom button works without camera app
Fix merge conflict in test.foo