Merge "Fix 4462497: Make ownerinfo preference layout more dynamic" into honeycomb-mr2