Merge "Enable & disable swipe interaction where appropriate" into main