remove layout block if media gallery is removed
Merge branch 'refs/heads/master' into 2.1