Merge "filebackend: update code comments and break some long lines"