Merge "Adding support for multiple overlay callbacks" into tm-qpr-dev