Merge "Add mock thermal service in PowerUI test"