Merge "Add custom start dialog with options"