Merge "Update JavaDoc for PictureListener after fix to capture layers"