Merge "Prune hidden system apps when removed via OTA" into jb-dev