Merge "Move default app preferences to one screen"