Merge "Add package verification to settings app" into jb-mr1-dev