Merge "Further centralize Minikin interaction" into lmp-dev