Merge "Revert "Allow AID_MEDIA to capture layer for video thumbnails""