Merge "Remove the divider above footer in Gesture Navigation Settings" into sc-dev