Incoming push flow improvements
Don't use Hockey for debug builds
Moved menu dismissal to the right places