Merge "Avoid flicker in Internet dialog" into sc-v2-dev