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

* commit '78fbf9871d3c377360b209ac73b0d6bb63480612':
  Fix occasional widget flashing