Merge "Define a category for "file management" apps." into qt-dev am: 1ab79483a7
am: 4d85a7172b

Change-Id: If72d7b24e7299bfbb72f366cdfc3f3e2d4a4c80a