Merge "Some improvements to the manage apps code:" into gingerbread