Merge "Making PowerMonitor API public" into main