Merge "Fix "G" logo changing position during device reboot." into main