Merge "Look for apps in the proper user"