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

* commit '2dac580d5288067061fc6d598072050be4263df7':
  Fixing small tablet issues