Merge proposals dependent on lp://staging/~thomas-voss/biometryd/do-not-wait-for-property-service

1. do-not-wait-for-property-service
2. Dependent merge proposals