Merge "Release display suspend blocker when shutting down DPC" into sc-dev