Merge "Error handler for start dialog from adb command"