Merge "Unit test fix for display-aware PowerManager API" into main