[automerger skipped] Merge "Modify the code logic of OnLayoutChangeListener in Caption preferences" am: 9c79dfb493 am: 658444b986 am: c631bf2ef0 -s ours
am skip reason: Change-Id Ic5711309c5b8af9834e5439d825b4cb2ed55fe01 with SHA-1 8416d8efd7 is in history

Change-Id: I2e6237a3f5dc4623e2c3a26ed3b96aa75bbcbadf