Merge "Fix screen pinning in seascape" into oc-dev