Merge "Don't rebuild labels when phone and emails field change" into mnc-dev