am faa22b97: am fbe232ef: Merge "Don\'t set super primary name on compact...
am faa22b97: am fbe232ef: Merge "Don\'t set super primary name on compact editor unless it changes" into mnc-dev
* commit 'faa22b97':
Don't set super primary name on compact editor unless it changes