Merge "Fix bug #17393417 Developer Options are not indexed after activating them" into lmp-dev