am c6c8fef3: Clearing DB if necessary, when applying the default layout

* commit 'c6c8fef3e90f84b26c3b8550ec6a1d668ca9200d':
  Clearing DB if necessary, when applying the default layout