Merge "Fix several UI bugs." into ics-mr1