Merge "Update low battery notification mechanism" into tm-dev