Fixed conflict with notification wifi and tablet ui

Change-Id: I6c14620aa973d20c7b3dc199ef19e390f627a9c3