Merge "Move the bg battery alert threshold to 10% to reduce clutter" into tm-dev