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

Change-Id: I0dd2a5226276dc74addf01d683d2a64cb55fa9a4