Merge "Fix jank when expanding photo in ContactDetailActivity."