Merge "Fix for issue : 3439708 Last frame is missing effect"