Merge "Clear extra QS tiles on configuration change" into main