Merge "Consume pending updates before focus failure" into nyc-dev am: e603e6fc9d am: 98e29a90c9
am: 4b13a4a117

* commit '4b13a4a1178455d7d22f1ba5bc987cb92026833d':

Change-Id: I2441254ec337cfe9737de41b33f4224fb33e81d7