Merge "Update FP listening right after POWER_PRESSED err" into tm-qpr-dev