Merge "BUG-1535 Ignore exception on toaster.close"