Fix camera and gallery apps after merge; use new tap