Merge "Update FP failure logic when device is unlocked" into tm-qpr-dev