Merge change I0d7dc3b8 into eclair

* changes:
  Fix notification bar performance.