Merge "Clean common intermediate files if overlay changed" into jb-dev