Merge "Add last connected device concept"