Measure actual fps (frameskip+unthrottle included), show all three on one line if you choose "both" (which I probably should rename)

Also prevent annoying scrolls in key mapping dialog

UI/ControlMappingScreen.cpp

@@ -179,6 +179,7 @@ void ControlMappingScreen::CreateViews() {
 	mode->AddChoice("Add");
 	*/
 	ScrollView *rightScroll = new ScrollView(ORIENT_VERTICAL, new LinearLayoutParams(1.0f));
+	rightScroll->SetScrollToTop(false);
 	LinearLayout *rightColumn = new LinearLayout(ORIENT_VERTICAL, new LinearLayoutParams(1.0f));
 	rightScroll->Add(rightColumn);