Merge "Move starting window dim layers behind the activity window layers" into oc-dr1-dev am: 262359fd am: 1b1a55a2 Change-Id: I6d081006fa7d2469e9dccbc5a81939efa5d05302