am 5c401a0e: am 3e683b6a: Merge "Fixed a bug where the panel got into a wrong state" into lmp-dev

* commit '5c401a0e0bf3b5f647f7f1791e10195f748bfe96':
  Fixed a bug where the panel got into a wrong state