Merge "Update todo list comment in PowerUsageAdvanced"