Merge "Fix flickering before transition animation of app search"