ext.echo.overlay: Various minor consistency fixes and cleanup

Change-Id: Id3b0f4fd7253282b190d6b2ed5fc78b714295e96
Merge "ext.echo.overlay: Various minor consistency fixes and cleanup"