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

Change-Id: I94b9ae9f9959d27cf420158214f282904362d473