Merge "Fixed a bug that the panel was not closable in the locked shade" into lmp-mr1-dev