Merge changes I97807db6,I7d350bc0

* changes:
  workaround for an issue where the screen would flicker sometimes
  fix an issue in SF where we could miss some updates