Merge "Update FP failure bouncer &  messaging logic" into tm-qpr-dev