Merge change from trunk to show trays when using the next/nextstacked bindings.