Merge "Improve flicker when open app info page" into sc-dev