am 6afbda9f: Merge "Clean common intermediate files if overlay changed" into jb-dev

* commit '6afbda9f07821deed6eb110247ab56fb47dfc775':
  Clean common intermediate files if overlay changed