Possible fix for multiple for duplicate MenuBar icons

Change-Id: I44bae7a40f22f882d37f260d2c8ce43b19e7bfee