Merge "aboot: mdtp: Fix recovery dialog not displayed with cmd-mode panel"