Merge "On configuration change setup screen decorations" into pi-dev