Merge "Separate active state from open/close." into lmp-dev