Merge "Adds two overlay settings fields for Swipe Up gesture"