Merge "Improve flicker when enter Security page" into sc-dev