Merge "Run app switch display change from on display thread" into main