Merge "Use constants for rc_patrolled values instead of numbers"