Merge "Adjust drag to pull down notifications to avoid desktop mode app handle" into main