Merge "Expose Display.getType() via TestApi." into rvc-dev