Merge "Let getNavBarPosition() can take displayId"