Merge "Use panel tracking as signal preventing auto-collapse." into klp-dev