Merge "Making quicksettings opaque again" into ics-mr1