Merge "Moved EXTRA_CLEAR_NEW_VOICEMAILS to MainComponent."