Merge "MiniThumbFile: Fix image/bitmap retrieval" into cm-10.2