Merge "Fix bug with home panel dream" into main