am 89e86555: Merge "Separate active state from open/close." into lmp-dev

* commit '89e865552f42db5cc31ef48ad35f3392e4ed1ac2':
  Separate active state from open/close.