Merge "Fix removal of fastbootd logo for wear" into main