Merge changes Ib5ce8e77,Iae383f7c into main

* changes:
  On fold/unfold, recalculate notif count immediately
  Apply shade state transition to OCCLUDED