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

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