Merge "Separate states for token and foreground bound" into main