Merge "Massage code to better support Files overlay." into nyc-dev