Merge "Display file names in Media libraries in grid mode" into nyc-dev