Merge "Fix bug #15434475 Developer Options do not show immediately after activating them" into lmp-preview-dev