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

Change-Id: I2857ad8c969543843821e64154df9d738c4368db