Merge "[flexiglass] remove separate flexi-notifs toggle" into main