Merge "Ensure ordering of overlay callbacks" into tm-qpr-dev