Merge "Dismiss error icon on setError(null) [regression] Bug #7442935" into jb-mr1-dev