Merge "watcheditem: Replace error message strings with constant string"