Merge pull request #26125 from nullaus/bug1077595

Bug1077595
(cherry picked from commit 906123b6d71bcd9d8db77227ffba7269e6cbaeb9)

Conflicts:
	apps/system/js/statusbar.js
Merge pull request #26310 from nullaus/v2.0

Merge pull request #26125 from nullaus/bug1077595