Merge "Change default intent"