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

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