Merge "Allow customisation of advanced settings in DocumentsUI" am: f1b325c1ec am: f2a3c341ab
am: b0b78ab587  -s ours

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