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

Change-Id: I13c3e609bc6244b33b29dada1a8fe7887d5c08aa