Merge "Create opModeFlow to always return correct status" into main