Merge "Fixes docked stack from being invisible from assistant stack over" into pi-dev