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

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