Merge "Try to fix ActivityThreadTest failure on foldables" into sc-v2-dev