Merge "Fix swipe up affordance bugs" into lmp-dev