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

* commit '98e29a90c915c57baca2bdcce4053f016e422f2a':

Change-Id: I921c201429d81ea0bbb1503bdc23855290e0d9ae