Added code conditionals for systemTray

Authored by vasudhamathur on Jul 7 2017, 5:01 PM.