Merge "[Device Controls] Fix background not showing up." into sc-dev