Merge "change navscreen in landscape"