Merge "Fix flicker when swiping from desktop to home" into main