Merge "Fix a broken test due to long press not done correctly in tests." into nyc-andromeda-dev