Merge "Change layer stack when moving displays." into oc-dev
am: 1a89073d8f

Change-Id: Iaf13f20739b163fb9e89a710460f89af949bbb92