Merge "Revert "Do not display ADB confirm dialog during boot""