Yup, that is the one.... I had an update some time ago, that placed a radio button on the lock screen for "Emergency 911" and that one is still there... but there was "No" icon in the system tray above, while now in 2.2 apparently there is.

I guess the System just letting you know that Big Brother is Tracking your location JIC there is an "Emergency...." Boy that gives me a warm fuzzy. Its one thing if I activate it in the case of a real emergency.... but to keep it "On & Tracking" all the time frankly is troubling.