Merge "Delete unused camera app helper"