Merge "Improve navscreen opening performance"