Merge "NanoApp: Make indentation consistent" into nyc-dev