Merge "Fix Android timer implementation not to reset interval on Stop." into devel...