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

Change-Id: Iad7554e7b893563a23a0adb2a4174199ea55beb2