Fixed a bug where the panel could get stuck closing am: b0e4f9e97e
am: 157e60f7a2

* commit '157e60f7a2ec40bdbb3bde0ea41f1c92bef93a1e':
  Fixed a bug where the panel could get stuck closing