Merge "On configuration change setup screen decorations" into pi-dev am: 10908b1972
am: 2a4ce94354

Change-Id: I298223a3e5712b91fa6105aa44fb35996d637f65