Merge pull request #9268 from lodr/bug-828155-avoid-flashes

Bug 828155 - Avoid flashing by delaying showing the tabs until we know what to show exactly
Cause r+(cherry picked from commit 34d0040465d4f01cdd575c3071af185db66bbca2)

Conflicts:
	apps/costcontrol/index.html