LPS-45853 Add and remove surfaces when adding or closing a portlet