am aef648f4: Merge "Better Minikin integration" into lmp-preview-dev

* commit 'aef648f405a6f2ed2e523e69cd6f1da884f4b9dd':
  Better Minikin integration