Merge "IMS-VT: Modify conditional logic of showing upgrade video icon"