Merge "Remove demo-specific developer options logic"