Merge "Fix black frame in finishing transition" into nyc-dev
am: cffe389

* commit 'cffe389a22cf3f3d63ec37a591b0d6226e1db99e':
  Fix black frame in finishing transition

Change-Id: I23e2deb5a2e3d6a6b285b327b5c3b0ea48790b37