sr: Improve overlay again

 * Clean up code, use acquire/retire model
 * Add some logging macros too

Change-Id: Ic3a1191764e8282eddd841901d276ecc1e9e3a59