Merge "Move charging indication vertically on time tick"