Merge "Update Emergency Dialer to match Dialer (6/7)."