Minor update to support persistence of selected App and AppGroup.