Merge "Change layer stack when moving displays." into oc-dev