Merge "Fix managed profile bugs in manage apps list"