Merge "Use more face-acquired frames for msg deferral" into tm-qpr-dev