Merge "Don't crash in window manager if we fail getting .apk resources." into jb-dev