Merge "Fix to show extra settings in eng build"