Merge "Better Minikin integration" into lmp-preview-dev