Merge "Fix InstalledAppCounterTest" into main