Merge "Revert "Revert "Wiring for displaying managed profiles"""