Merge "Reinflate background on configuration change" into main