Merge "Fix issue where EmergencyDialer is slow to open in some cases." into pi-dev am: 3fe878a9d5
am: 9537402431

Change-Id: I35994bcf7ae078dd38652c79d979c8434e8ff719