Merge "Add Battery skeleton page and corresponding TS flag" into main