Merge "Fixing typo in swipe helper causing views not to be faded when swiped." into oc-mr1-dev