Merge "A flush of a video decoder connected to a native window must reclaim" into jb-mr2-dev