Merge "Remove outFrame from the parameters of addWindow" into sc-dev