Merge "Wait on frame work fences when frames are dropped" into nyc-mr1-dev