Merge "Per-display resumed activities"