Merge "Fix fingerprint swipe gesture settings for secondary users." into nyc-mr1-dev