am f17fdcaf: Merge changes I9f3cbbe0,I12a6f9a9 into jb-dev

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