Merge changes Ic5ceb729,I51fab5be,Id7abd858,Ic5fce695,I14a75cd6, ...

* changes:
  Fixed the interactivness of the shelf on the keyguard
  Follow up fixes for expandhelper
  Fix guts not expanding when QSPanel is expanded
  Fixed an issue where the setVisibility wasn't annotated
  Fixed a crash when a notification is updated
  Improved the performance of the shelf / scrim
  Fixed a caching issue where icons could stay greyscale