Merge "Scale down expanded view while it is being dragged" into main