Merge "Revert "Disabled apps should also be shown in restricted profiles app list"" into jb-mr2-dev