Merge "Move logic to move the shade to the default display once locked to ShadeDisplaysRepository" into main