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