Merge "Skip record layer when setting category on MRR" into main