if we are running grenade, use screen

we were always turning screen off. This breaks service stop in
grenade.

Change-Id: I62daf99eddb714c8861ba08f7da844c4f6c0c354
Merge "if we are running grenade, use screen"