Merge "Marking SystemApi for PackageWatchdog and Observer" into main