Merge pull request #18233 from julienw/995173-fix-notice-timeout-v2

Bug 995173 - [Messages] The in-app notification for the "message is too ...
Conflicts:
	apps/sms/js/thread_ui.js