am 2bfe9651: Merge "Fix unnecessairy announcements when collapsing shade" into mnc-dev

* commit '2bfe96513884f0c4a4836a615a80e17a1ba30173':
  Fix unnecessairy announcements when collapsing shade