Merge "Progressive disclosure on selected UIs: app, display"