Merge "Asset updates for tablet notifications and layout fixes to quicksettings" into ics-mr1