Merge "Don't use save/restore which stop drawing toggle switch drawables" into main