[automerger skipped] Merge "FileImage: make thread-safe" into qt-dev am: e4a2c3af -s ours
am: dad5eee1 -s ours
am skip reason: change_id I31637fce0fbd66f3fa6c5c478da09bae65a52229 with SHA1 55988c46 is in history
Change-Id: Idb54ee11039f21b4f6c274768e888d6865a8c98f