Merge "Remove battery from bluetooth tile icon"