Merge "Allow specifying gravity for overlay display" into main