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

* commit '8e116befc9dc59d47e64842012ba3d496e75ad3b':
  Fix state weirdness in the panel