Merge "Fix 3315488: Wrap OwnerInfo layout in a ScrollView" into honeycomb