Merge "Update PackageSetting flags when updating" into jb-mr1-dev