Merge "Integrate the Debug store into frameworks" into main