Merge "Update FingerprintEnrollFindSensor for landscape" into sc-dev