Merge "Update expanded view "drag to dismiss" animation" into main