Merge "Remove demo-specific Developer Options logic"