Merge "apps: Make sections collapsible"