Merge "Make SurfaceView layers captured by screenshotApplications()"