Merge "Fix content timeout item misorder in Display category in A11y Settings"