Merge "Removing all complication for home control panel" into main