Merge "Fix Button touch feedback on Gingerbread" into lmp-mr1-ub-dev