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

* commit 'fd8f7f120dd04acaa7ac81680dcc058d4a1d20d4':
  Fix 4462497: Make ownerinfo preference layout more dynamic