Add extra device checks when transitioning to away, avoiding false negatives