Merge "Remove FEATURE_SWIPE_TO_DISMISS functionality"