Merge "Fix compat issue with apps directly calling LoadedApk.makeApplication()." into tm-dev