Merge "Remove TestApi use from WindowContainer"