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

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

Change-Id: I647b6e58d443d9690d8574f8eb2e778cd5735926