am 0495f4ed: Merge "Make SurfaceView layers captured by screenshotApplications()"

* commit '0495f4eded46efd7035ed672dc933ec6430b93fd':
  Make SurfaceView layers captured by screenshotApplications()