Merge "Fix IllegalStateException in getSupportedPowerMonitors API" into main