Merge "Tweaks to outline API" into lmp-dev