Merge "getDisplayViewportByType doesn't count more than one viewport"