Add PushMessage context, better device selection handling