Merge "Delete old forward-locked apps on upgrade" into jb-dev