Merge "Fix 2579923: Make changing lock screen method more discoverable." into froyo