Merge "End ripple effect on maximized button when finished dragging" into main