Merge "Fix pushing the activity manager states down to power manager." into main