Merge "Fix unnecessairy announcements when collapsing shade" into mnc-dev