Revert "Revert "Fix system menu not showing""

This reverts commit fbd29de4d5053022b63197df3068a78f234bff99.

Commit 0843fd735 fixes the problem we were seeing with the original change.

Open-webOS-DCO-1.0-Signed-off-by: Eric Blade <eric.blade@palm.com>

Change-Id: I75a963a25a29be3470015c60e1842a1df123a93f
Merge "Revert "Revert "Fix system menu not showing"""