Merge "Fix dark flash when transition ends."