Merge "Support shadows and reordering in ViewOverlay" into nyc-mr2-dev
am: 4638ef17d5

Change-Id: I240d4b7397d06d3994fd17f4e3694ceef58c16f3