Merge "Disable app switch drop behaviour" into main