Merge changes I9f3cbbe0,I12a6f9a9 into jb-dev

* changes:
  Fix "Battery/Status/Clock status bar area flickers when dragging down"
  minor refactoring in praparation of crop fix