Merge "Unsuspend apps for affected user correctly" into main