Merge "Suppress the warning toast if the preferredDisplay was set to singleTask"