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

* commit '80ed025f8b2e1e48076995c557d2dd656f01d17f':
  Consume pending updates before focus failure

Change-Id: I339c2462ac28960830a9a5e65a4a9ce011ad700b