Merge "Add and document .nomedia constant for MediaStore (Issue 6365)"