CMFileManager: Latest merges

Patch 2: Added themes\strings.xml and removed all comments as requested

Change-Id: Ie5e61d0ad5334aca54ecc951f9bde714106e35a1