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

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