Merge "Using surface rotation instead of insets to determine seascape configuration" into ub-launcher3-edmonton