Merge "Ignoring FloatingTaskThumbnailView:id/thumbnail" into udc-qpr-dev