Merge "Consume pending updates before focus failure" into nyc-dev am: e603e6fc9d am: 80ed025f8b
am: fdfec52214

* commit 'fdfec522148382e58885ad4d841393b3ee433348':
  Consume pending updates before focus failure

Change-Id: I456b6033abd8f906edcde9d8a03d5b2a55fe925b