Merge "Move starting window dim layers behind the activity window layers" into oc-dr1-dev
am: 262359fd29

Change-Id: I372546aa819df8d26af782e1e12ec0097d6c0837