Merge "Adding content desciption for image preview screen" into udc-dev