Merge "Fixed bug where custo drawer remained open after power-off"