Revert: Quick QS and Force Expanded Notifications for cleanup next