Merge "Modify the code logic of OnLayoutChangeListener in Caption preferences" am: 9c79dfb493 am: 658444b986

Change-Id: I969cf4b26db7c36917bb4b8741db8ad5833c8d7c