Merge "fix navscreen orientation"