Merge "When editing contacts, automatically expand "More" if data has been entered Bug:2534580"