Merge "Added columns to store package name and uri to a custom app"