Merge "Add Widget State Tracker" into main