Merge "Wait on frame work fences when frames are dropped am: 06e2e9cf4c am: 7a14f5aeb9" into nyc-mr1-dev-plus-aosp