Merge "Limit flush and invalidation to mapped memory range" into nyc-dev