Merge "48dp touch targets in contact editor" into lmp-mr1-dev