Merge "Fix issue #3400119: API to specify a black background behind a window transition"