Merge "Improve on unbundled app build"