Merge "Fixes autoadvance on find sensor page for fingerprint." into nyc-dev