am 7b6c0da3: am 78fbf987: Merge "Fix occasional widget flashing" into jb-mr2-dev

* commit '7b6c0da3292857af8f6126b9b2450dca606034e3':
  Fix occasional widget flashing