Merge "Modify the code logic of OnLayoutChangeListener in Caption preferences"