Merge "Moving DisplayPowerController.dump outside syncRoot lock" into main