Merge "Fix LTR & conversation updates on main thread" into sc-dev