Fix drawing order when shadow is not applied am: b8e4d4a19d
am: 19fe32bbf9

Change-Id: Ife4b75ac89c50074ccffacc7325353140ae93100