Merge "Update buttons in FP find sensor" into oc-dr1-dev