am 96f6491a: am 475255bf: am 1b3b2544: Merge "Dismiss error icon on setError(null) [regression] Bug #7442935" into jb-mr1-dev

* commit '96f6491aa72711b380e97649f8d4e7758bf00510':