am b37e5d75: am 7b9b41c1: am 1b3b2544: Merge "Dismiss error icon on setError(null) [regression] Bug #7442935" into jb-mr1-dev

* commit 'b37e5d756f04489ff95226e26ebfdf141d135f91':
  Dismiss error icon on setError(null) [regression] Bug #7442935