Merge "Revert "Add ability to set and get DefaultPhoneApplication""