Merge "Fixing issue where toasts were getting queued. (Bug 6572269)"