Merge "Update BridgePowerManager#userActivity to take Display ID" into sc-dev