Merge "Fix regression introduced when fixing focus issue with ScrollView. Bug #2581646" into froyo