Merge "Fix tablet picker layout." into ics-mr1