Merge "Restore QS data even with just one intent" into main