Merge pull request #8601 from ferjm/bug841521

Bug 841521 - The Trusted UI never opens on first launch (purchase button...(cherry picked from commit 07be1290ffca3c1c6387e19273ec8b05fbce468d)

Conflicts:

	apps/system/js/window_manager.js