Merge "Skip updating stack config if it is detached from a display" into pi-dev