Merge "Consolidate filling of window frames and config for client" into sc-dev