am b20a60bb: am 2dac580d: Merge "Fixing small tablet issues" into ics-mr1

* commit 'b20a60bbc409e0a24973a6167c88f3a11ab99654':
  Fixing small tablet issues