Merge "Fixing NPE when system image is removed." into studio-1.1-dev