Merge "Add flag for onWlcStateChanged" into main