Merge "Only install after MCS success" into gingerbread