Merge "Fix flickering issue"