Merge "Show dismiss target when dragging expanded view" into main