Merge "Fix issue where EmergencyDialer is slow to open in some cases." into pi-dev