Merge "fix navscreen animation"