Added Gallery.HasWorker setting
Merge branch 'master' into qa