Merge "Optimize screen time cross power connection logic from O(N^2) to O(N)" into udc-dev