Merge "Fix inline controls from being swipeable" into nyc-dev