Merge "fix hide navscreen bug"