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

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

Change-Id: I182036d46c9551bc7def42af9190ef5dd25d7b59