Merge "[pm] fix boot time regression from copying mQueriesViaComponent" into main