Merge "Reuse existing TouchHelpers on rotation" into lmp-dev