Merge "Move Timer from init to libbase"