am 25e8a02e: am 8e116bef: am cd6e8015: am 8e43c3e7: am 26aa04c3: Fix state weirdness in the panel

* commit '25e8a02e7005c080decd7b6119e03d8ab7f58c4f':
  Fix state weirdness in the panel