Merge "Remove swipe-up gesture from Tuner" into nyc-mr1-dev