Merge "FPSettings depends on SensorProps for maxEnrolls" into tm-dev