Fix flicker
am: b583f08

* commit 'b583f084c9f63b11a58a6ac7ad18613dc38ccdb6':
  Fix flicker