Revert "Merge pull request #16321 from vingtetun/bug971006-final"

This reverts commit 19304fe63b26630f95c6f3a7da49349b433d476e, reversing
changes made to b9859b9c2199e1c5b7e4eda220e556a7ff43cd21.

Conflicts:
	apps/system/js/utility_tray.js
	apps/system/test/unit/utility_tray_test.js