Merge "Pass display ID to PowerManagerService on user interaction" into sc-dev