VID-391 adding loading graphic when swapping and keeping"