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

* commit 'cf83c070e3caa3ee6e5df8a4e6545ae43cb08a35':
  Making quicksettings opaque again