Simplified the singleton creation/destruction

Change-Id: Ibe5faebe94d19cb31b79a9be12358090f9a4c1fa
Merge topic 'simplify-fileformatmanager' into master

1d5c0bd9 Simplified the singleton creation/destruction