Merge "Make notification icons and autocancel overlayable" into sc-dev