Merge "Added logic to show the shell drop target and update the bubble location" into main