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

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

Change-Id: I48f140fb7a77c6c6b0a228d93cb8c6375d868165