Merge "Move starting window dim layers behind the activity window layers" into oc-dr1-dev