Merge "Remove flicker during fingerprint enrollment" into tm-qpr-dev