Merge "Display file names in Media libraries in grid mode" into nyc-dev am: 8800f2d314
am: dfd8ef3a63

* commit 'dfd8ef3a63c1f1f24ac5c6c54822b61544f7a0af':
  Display file names in Media libraries in grid mode