Merge "Fixed race condition while powering down" into main