Merge "Get display id from display instead of the display of root view" into tm-dev