Merge "Follow-up on comments from splitting app info"