Merge "Fix split divider janky" into rvc-dev am: a171ec42 am: 17ebe76f am: aa28e97c am: d811e282 Change-Id: I6a82a72b3bf3a0ee5ee47061c57e2353a8fa4996