Merge "Respect Z-ordering when assigning fullscreen-dim layer." into oc-dev am: 2ad5beb807
am: 89f98d022d

Change-Id: If90d16aa38ba378b8762d8c77a88f347ebbc293b