Merge "Fix ApplicationPackageManager.getDrawable() should drawable result"