Merge "Do not display ADB confirm dialog during boot"