Merge "Made some changes to window caption APIs"