Fix drawing order when shadow is not applied
am: b8e4d4a19d

Change-Id: Id11c2c9ed2c5a575653b18c8bfe6b8a84ad44ddd