Fixed bundling after prepare changes

Author: Tsvetan Raikov

lib/services/platform-service.ts

@@ -268,9 +268,10 @@ export class PlatformService implements IPlatformService {
 			if (changeInfo.configChanged || changeInfo.modulesChanged) {
 				this.applyBaseConfigOption(platformData).wait();
 				platformData.platformProjectService.processConfigurationFilesFromAppResources().wait();
-				platformData.platformProjectService.interpolateConfigurationFile().wait();
 			}
 
+			platformData.platformProjectService.interpolateConfigurationFile().wait();
+
 			this.$logger.out("Project successfully prepared ("+platform+")");
 		}).future<void>()();
 	}

lib/services/project-changes-info.ts

@@ -60,16 +60,13 @@ export class ProjectChangesInfo {
 					}
 				}
 
-				if (this.$options.bundle !== this.prepareInfo.bundle) {
-					this.modulesChanged = true;
-					this.prepareInfo.bundle = this.$options.bundle;
-				}
-				if (this.$options.release !== this.prepareInfo.release) {
+				if (this.$options.bundle !== this.prepareInfo.bundle || this.$options.release !== this.prepareInfo.release) {
 					this.appFilesChanged = true;
 					this.appResourcesChanged = true;
 					this.modulesChanged = true;
 					this.configChanged = true;
 					this.prepareInfo.release = this.$options.release;
+					this.prepareInfo.bundle = this.$options.bundle;
 				}
 				if (this.modulesChanged || this.appResourcesChanged) {
 					this.configChanged = true;