Merge "Add padding for right image in stream image view"