Merge "Fix tabs abruptly reset during swipe" into sc-dev