Merge "fix 2430251 - all apps touch targets misaligned."