Merge "Fixes docked stack from being invisible from assistant stack over" into pi-dev am: 505267f1 am: 40a36f83 Change-Id: Iccba5593abae30a414b81e5c76bef00b2d2bb1e4