Merge pull request #9110 from evelynhung/issue-860205

bug 860205 - check visible state when initialing. r=arthur(cherry picked from commit 79ccd192e70f99feb9a10e6e83dd8de0a4971160)

Conflicts:

	apps/settings/index.html
Merge pull request #9131 from evelynhung/uplift-860205-v1-train

Merge pull request #9110 from evelynhung/issue-860205