Merge "Respect Z-ordering when assigning fullscreen-dim layer." into oc-dev