Merge "Update device state overlay config usage to new API" into main