Merge "Unify touch feedback drawable and reveal drawable"