Merge "Update FP sensor location before showing dwellAnim" into tm-qpr-dev