Merge "Use larger photo in contact editor" into lmp-mr1-dev