Merge "Support different navigation modes on WM flicker" into sc-dev