Merge "Fix bug 5534414 - Unselected tab states for Holo" into ics-mr1