Fix exception of selecting sightseeing layer
Merge remote-tracking branch 'refs/remotes/upstream/r1.6' into r1.6