am 34dd937b: Merge "Making quicksettings opaque again" into ics-mr1

* commit '34dd937be1a325fd92d6479822960e4ca13f2420':
  Making quicksettings opaque again