Merge "Simplify code for All Apps touch feedback"