Fix drawing order when shadow is not applied

Bug 31340316

Change-Id: Ibbdd61d5b918e680becb13fac810220940f5b50f
2 files changed