Merge "Maintain correct Record Issue QS tile active state." into main