Merge "Fix activity move between displays" into oc-dev