Merge "Fixing small tablet issues" into ics-mr1