Merge "Allow customisation of advanced settings in DocumentsUI" am: f1b325c1ec
am: f2a3c341ab

* commit 'f2a3c341ab9061b576ab399e1336e9e45afb8c2e':
  Allow customisation of advanced settings in DocumentsUI