Merge "overlay: Add support for using scalar calculations"