Merge "Passing correct displayId to modified API"