Merge "Consume pending should bring layout to clean state" into nyc-dev