Merge "Check system app before removal" into jb-dev