[[ MERG-6.7 ]] Update Android and Windows