Fix bug with RdV AP locking control on disable