Merge changes I6e3f4da2,I8acfbd1a into nyc-dev

* changes:
  Fully detach unused scrap views
  Remove detached headers