Merge "Update expanded view drop target size based on value from shell" into main