Merge "Introduce LogdSizePreferenceControllerV2"