The shadow is restored + redundant fade removed. Bug: 26986946 Change-Id: I31dde7d03f60be470e1c5e06dcdce828d3e4eaa0 (cherry picked from commit 3134ddf9)