Better handling of interaction between layer tree and layer picker