Merge "Fix fingerprint swipe gesture settings for secondary users." into nyc-mr1-dev am: fc5efaeabc am: 6d395bfd74
am: add5fd286c

Change-Id: I848cd8d65e22651bd54276f0df07c7459bc9f40b